Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle lief 0.15 renaming of LOAD_COMMAND_TYPES and ELF_CLASS #5595

Open
wants to merge 5 commits into
base: 25.1.x
Choose a base branch
from

Conversation

tkelman
Copy link
Contributor

@tkelman tkelman commented Jan 16, 2025

Description

fix #5594 - missed osx parts that should have included in #5565

handle lief 0.15 renaming of LOAD_COMMAND_TYPES

https://lief.re/doc/stable/changelog.html#july-21th-2024

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@tkelman tkelman requested a review from a team as a code owner January 16, 2025 19:56
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jan 16, 2025
Copy link

codspeed-hq bot commented Jan 16, 2025

CodSpeed Performance Report

Merging #5595 will not alter performance

Comparing tkelman:lief-load-command-types (e3b7a56) with 25.1.x (6873259)

Summary

✅ 5 untouched benchmarks

@tkelman tkelman mentioned this pull request Jan 16, 2025
2 tasks
@h-vetinari
Copy link
Contributor

Thanks a lot for the PR! Given that this still breaks with 0.15 (and thus the version that conda-build 25.1 claimed compatibility to), I think it would be a good idea to backport this patch.

@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

I see you've got 25.1.x and 24.11.x branches here, but I don't think #5565 was included in 24.11.x. would you like me to open a separate PR, or change the target branch, or will you handle the cherry-picking?

@h-vetinari
Copy link
Contributor

No need for action right now. First off, a backport is not my decision, and secondly, I think it needs to land on main first anyway

@jaimergp
Copy link
Contributor

I think we can tsrhet 25.1.x. That branch will be synced with main later.

jaimergp
jaimergp previously approved these changes Jan 17, 2025
@tkelman tkelman changed the title handle lief 0.15 renaming of LOAD_COMMAND_TYPES handle lief 0.15 renaming of LOAD_COMMAND_TYPES and ELF_CLASS Jan 17, 2025
@h-vetinari
Copy link
Contributor

h-vetinari commented Jan 17, 2025

I think we can target 25.1.x.

Could you retarget the branch then? Contributors can't do it, it needs maintainer rights

Edit: apparently, I was wrong. 🤷 🙃

@tkelman tkelman changed the base branch from main to 25.1.x January 17, 2025 10:47
@tkelman tkelman changed the base branch from 25.1.x to main January 17, 2025 10:48
@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

I tried that out but it looked a little messy adding in 4 unrelated commits that exist on main but not the 25.1.x branch

@h-vetinari
Copy link
Contributor

it looked a little messy adding in 4 unrelated commits that exist on main but not the 25.1.x branch

Obviously you'd have to rebase out those commits. git rebase -i 25.1.x and then remove those commits that aren't yours.

@tkelman tkelman force-pushed the lief-load-command-types branch from f96a7ee to 642f9bc Compare January 17, 2025 11:11
@tkelman tkelman changed the base branch from main to 24.11.x January 17, 2025 11:12
@tkelman tkelman changed the base branch from 24.11.x to 25.1.x January 17, 2025 11:12
@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

pre-commit.ci autofix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Status: Approved
Development

Successfully merging this pull request may close these issues.

More issues with lief
4 participants